diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 8f238fc..381b70f 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -325,7 +325,8 @@
 		$RES 			= new $driver();
 		$RES->conn_id	= $this->conn_id;
 		$RES->result_id	= $this->result_id;
-		
+		$RES->num_rows	= $RES->num_rows();
+
 		if ($this->dbdriver == 'oci8')
 		{
 			$RES->stmt_id		= $this->stmt_id;
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index b34c4a8..3e9db57 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -62,11 +62,17 @@
 
 <h1>Change Log</h1>
 
+<h2>Version 1.5.5</h2>
+<p>Release Date: -- still in development </p>
+<ul>
+    <li>Fixed a bug in database driver where num_rows property wasn't getting updated </li>
+</ul>
 <h2>Version 1.5.4</h2>
 <p>Release Date: July 12, 2007 </p>
 <ul>
-	<li>Added <a href="./libraries/language.html">custom Language files</a> to the <a href="./general/autoloader.html">autoload</a> options. </li>
-	<li>Added stripslashes() to the _clean_input_data() function in the <a href="./libraries/input.html">Input class</a> when magic quotes is on so that data will always be un-slashed within the framework.</li>
+    <li>Added <a href="./libraries/language.html">custom Language files</a> to the <a href="./general/autoloader.html">autoload</a> options. </li>
+</ul>
+<ul><li>Added stripslashes() to the _clean_input_data() function in the <a href="./libraries/input.html">Input class</a> when magic quotes is on so that data will always be un-slashed within the framework.</li>
 	<li>Added array to string into the <a href="general/profiling.html">profiler</a>.</li>
 	<li>Added some additional mime types in application/config/mimes.php.</li>
 	<li>Added filename_security() method to <a href="./libraries/input.html">Input library</a>.</li>